Autogenerated HTML docs for v1.6.2-149-g6462
diff --git a/RelNotes-1.6.2.1.txt b/RelNotes-1.6.2.1.txt index 3a2d3bf..a33782d 100644 --- a/RelNotes-1.6.2.1.txt +++ b/RelNotes-1.6.2.1.txt
@@ -4,3 +4,22 @@ Fixes since v1.6.2 ------------------ +* .gitignore learned to handle backslash as a quoting mechanism for + comment introduction character "#". + +* timestamp output in --date=relative mode used to display timestamps that + are long time ago in the default mode; it now uses "N years M months + ago", and "N years ago". + +* git-add -i/-p now works with non-ASCII pathnames. + +* "git hash-object -w" did not read from the configuration file from the + correct .git directory. + +* git-send-email learned to correctly handle multiple Cc: addresses. + +--- +exec >/var/tmp/1 +O=v1.6.2-21-g7681ed2 +echo O=$(git describe maint) +git shortlog --no-merges $O..maint
diff --git a/RelNotes-1.6.3.txt b/RelNotes-1.6.3.txt index ee1fddb..7f36b6c 100644 --- a/RelNotes-1.6.3.txt +++ b/RelNotes-1.6.3.txt
@@ -80,23 +80,6 @@ Here are fixes that this release has, but have not been backported to v1.6.2.X series. -* .gitignore learned to handle backslash as a quoting mechanism for - comment introduction character "#" (backport by merging dd482ee if - needed). - -* timestamp output in --date=relative mode used to display timestamps that - are long time ago in the default mode; it now uses "N years M months - ago", and "N years ago" (backport by picking 10edf37 if needed). - -* git-add -i/-p now works with non-ASCII pathnames (backport by picking - 8851f48 if needed). - -* "git hash-object -w" did not read from the configuration file from the - correct .git directory (backport by merging 272459a if needed). - -* git-send-email learned to correctly handle multiple Cc: addresses - (backport by merging afe756c if needed). - --- exec >/var/tmp/1 O=v1.6.2-77-g8cc3fe4
diff --git a/blame-options.txt b/blame-options.txt index df2a7c1..63fc197 100644 --- a/blame-options.txt +++ b/blame-options.txt
@@ -70,6 +70,14 @@ tree copy has the contents of the named file (specify `-` to make the command read from the standard input). +--date <format>:: + The value is one of the following alternatives: + {relative,local,default,iso,rfc,short}. If --date is not + provided, the value of the blame.date config variable is + used. If the blame.date config variable is also not set, the + iso format is used. For more information, See the discussion + of the --date option at linkgit:git-log[1]. + -M|<num>|:: Detect moving lines in the file as well. When a commit moves a block of lines in a file (e.g. the original file diff --git a/config.txt b/config.txt index f5152c5..56bd781 100644 --- a/config.txt +++ b/config.txt
@@ -677,6 +677,16 @@ See linkgit:git-log[1], linkgit:git-show[1], linkgit:git-whatchanged[1]. +format.thread:: + The default threading style for 'git-format-patch'. Can be + either a boolean value, `shallow` or `deep`. 'Shallow' + threading makes every mail a reply to the head of the series, + where the head is chosen from the cover letter, the + `\--in-reply-to`, and the first patch mail, in this order. + 'Deep' threading makes every mail a reply to the previous one. + A true boolean value is the same as `shallow`, and a false + value disables threading. + gc.aggressiveWindow:: The window size parameter used in the delta compression algorithm used by 'git-gc --aggressive'. This defaults @@ -1160,6 +1170,10 @@ pull.twohead:: The default merge strategy to use when pulling a single branch. +rebase.stat:: + Whether to show a diffstat of what changed upstream since the last + rebase. False by default. + receive.fsckObjects:: If it is set to true, git-receive-pack will check all received objects. It will abort in the case of a malformed object or a
diff --git a/git-annotate.html b/git-annotate.html index ac1b9d2..56a4d49 100644 --- a/git-annotate.html +++ b/git-annotate.html
@@ -474,6 +474,19 @@ </p> </dd> <dt> +--date <format> +</dt> +<dd> +<p> + The value is one of the following alternatives: + {relative,local,default,iso,rfc,short}. If --date is not + provided, the value of the blame.date config variable is + used. If the blame.date config variable is also not set, the + iso format is used. For more information, See the discussion + of the --date option at <a href="git-log.html">git-log(1)</a>. +</p> +</dd> +<dt> -M|<num>| </dt> <dd> @@ -536,7 +549,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-03-03 08:28:31 UTC +Last updated 2009-03-11 23:56:00 UTC </div> </div> </body> diff --git a/git-blame.html b/git-blame.html index 469390d..8ea9dbb 100644 --- a/git-blame.html +++ b/git-blame.html
@@ -488,6 +488,19 @@ </p> </dd> <dt> +--date <format> +</dt> +<dd> +<p> + The value is one of the following alternatives: + {relative,local,default,iso,rfc,short}. If --date is not + provided, the value of the blame.date config variable is + used. If the blame.date config variable is also not set, the + iso format is used. For more information, See the discussion + of the --date option at <a href="git-log.html">git-log(1)</a>. +</p> +</dd> +<dt> -M|<num>| </dt> <dd> @@ -845,7 +858,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-03-03 08:28:31 UTC +Last updated 2009-03-11 23:56:00 UTC </div> </div> </body> diff --git a/git-config.html b/git-config.html index 0892860..94cca0d 100644 --- a/git-config.html +++ b/git-config.html
@@ -1776,6 +1776,21 @@ </p> </dd> <dt> +format.thread +</dt> +<dd> +<p> + The default threading style for <em>git-format-patch</em>. Can be + either a boolean value, <tt>shallow</tt> or <tt>deep</tt>. <em>Shallow</em> + threading makes every mail a reply to the head of the series, + where the head is chosen from the cover letter, the + <tt>--in-reply-to</tt>, and the first patch mail, in this order. + <em>Deep</em> threading makes every mail a reply to the previous one. + A true boolean value is the same as <tt>shallow</tt>, and a false + value disables threading. +</p> +</dd> +<dt> gc.aggressiveWindow </dt> <dd> @@ -2771,6 +2786,15 @@ </p> </dd> <dt> +rebase.stat +</dt> +<dd> +<p> + Whether to show a diffstat of what changed upstream since the last + rebase. False by default. +</p> +</dd> +<dt> receive.fsckObjects </dt> <dd> @@ -3106,7 +3130,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-03-08 08:44:54 UTC +Last updated 2009-03-11 23:56:00 UTC </div> </div> </body>
diff --git a/git-format-patch.html b/git-format-patch.html index c1f7465..402a60e 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -992,7 +992,7 @@ </p> </dd> <dt> ---thread +--thread[=<style>] </dt> <dd> <p> @@ -1000,6 +1000,13 @@ subsequent mails appear as replies to the first. Also generates the Message-Id header to reference. </p> +<div class="para"><p>The optional <style> argument can be either <tt>shallow</tt> or <tt>deep</tt>. +<em>Shallow</em> threading makes every mail a reply to the head of the +series, where the head is chosen from the cover letter, the +<tt>--in-reply-to</tt>, and the first patch mail, in this order. <em>Deep</em> +threading makes every mail a reply to the previous one. If not +specified, defaults to the <em>format.thread</em> configuration, or <tt>shallow</tt> +if that is not set.</p></div> </dd> <dt> --in-reply-to=Message-Id @@ -1175,7 +1182,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-03-06 08:20:42 UTC +Last updated 2009-03-11 23:56:00 UTC </div> </div> </body>
diff --git a/git-format-patch.txt b/git-format-patch.txt index e7ae8cf..c14e3ee 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt
@@ -127,10 +127,18 @@ which is the commit message and the patch itself in the second part, with "Content-Disposition: inline". ---thread:: +--thread[=<style>]:: Add In-Reply-To and References headers to make the second and subsequent mails appear as replies to the first. Also generates the Message-Id header to reference. ++ +The optional <style> argument can be either `shallow` or `deep`. +'Shallow' threading makes every mail a reply to the head of the +series, where the head is chosen from the cover letter, the +`\--in-reply-to`, and the first patch mail, in this order. 'Deep' +threading makes every mail a reply to the previous one. If not +specified, defaults to the 'format.thread' configuration, or `shallow` +if that is not set. --in-reply-to=Message-Id:: Make the first mail (or all the mails with --no-thread) appear as a
diff --git a/git-rebase.html b/git-rebase.html index b63d66c..7c8a3eb 100644 --- a/git-rebase.html +++ b/git-rebase.html
@@ -486,6 +486,20 @@ <pre><tt>git rebase --abort</tt></pre> </div></div> </div> +<h2 id="_configuration">CONFIGURATION</h2> +<div class="sectionbody"> +<div class="vlist"><dl> +<dt> +rebase.stat +</dt> +<dd> +<p> + Whether to show a diffstat of what changed upstream since the last + rebase. False by default. +</p> +</dd> +</dl></div> +</div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> <div class="vlist"><dl> @@ -577,7 +591,27 @@ </dt> <dd> <p> - Display a diffstat of what changed upstream since the last rebase. + Be verbose. Implies --stat. +</p> +</dd> +<dt> +--stat +</dt> +<dd> +<p> + Show a diffstat of what changed upstream since the last rebase. The + diffstat is also controlled by the configuration option rebase.stat. +</p> +</dd> +<dt> +-n +</dt> +<dt> +--no-stat +</dt> +<dd> +<p> + Do not show a diffstat as part of the rebase process. </p> </dd> <dt> @@ -1057,7 +1091,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-03-01 08:02:36 UTC +Last updated 2009-03-11 23:56:01 UTC </div> </div> </body>
diff --git a/git-rebase.txt b/git-rebase.txt index da3c38c..57bd333 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -192,6 +192,13 @@ git rebase --abort +CONFIGURATION +------------- + +rebase.stat:: + Whether to show a diffstat of what changed upstream since the last + rebase. False by default. + OPTIONS ------- <newbase>:: @@ -232,7 +239,15 @@ -v:: --verbose:: - Display a diffstat of what changed upstream since the last rebase. + Be verbose. Implies --stat. + +--stat:: + Show a diffstat of what changed upstream since the last rebase. The + diffstat is also controlled by the configuration option rebase.stat. + +-n:: +--no-stat:: + Do not show a diffstat as part of the rebase process. --no-verify:: This option bypasses the pre-rebase hook. See also linkgit:githooks[5].
